Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 24 Oct 2011 02:14:34 +0000 (19:14 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 24 Oct 2011 02:14:34 +0000 (19:14 -0700)
commit986b24d84c19f14a3937e5688947f685e405d7a0
tree6e84bb7c24ab0a1f3aaec555588612489bc48fe4
parent90182be5e22e6d33b6b9093534671419ba94510b
parent7ff479bf576c2f87bd933142d7c5ab609c0ddc7f
Merge from trunk.